build: Include GSK types in gtk_test_register_all_type()

diff --git a/gtk/gtktestutils.c b/gtk/gtktestutils.c
index 35691d0c3d9a3312fa3f8fdc0793981f72f6ae04..690931a153962d141ec22fabc16d739836997b99 100644 (file)
--- a/gtk/gtktestutils.c
+++ b/gtk/gtktestutils.c
@@ -40,6 +40,16 @@
 #include <gtk/gtk.h>
 #define GTK_COMPILATION
 
+#include <gsk/gl/gskglrenderer.h>
+
+#ifdef GDK_WINDOWING_BROADWAY
+#include <gsk/broadway/gskbroadwayrenderer.h>
+#endif
+
+#ifdef GDK_RENDERING_VULKAN
+#include <gsk/vulkan/gskvulkanrenderer.h>
+#endif
+
 #ifdef GDK_WINDOWING_X11
 #include <gdk/x11/gdkx.h>
 #endif

diff --git a/gtk/meson.build b/gtk/meson.build
index 614b4079f87c0fb1b57b13a3b0a296fddde691e8..77936af5679c483251732ab69ce2c7e564690889 100644 (file)
--- a/gtk/meson.build
+++ b/gtk/meson.build
@@ -925,6 +925,7 @@ typefuncs = custom_target('gtktypefuncs.inc',
                           depends: [ gdkenum_h, gskenum_h, ],
                           output: 'gtktypefuncs.inc',
                           input: gdk_headers +
+                            gsk_public_headers +
                             gtk_public_headers +
                             gtk_deprecated_headers +
                             [ gtktypebuiltins_h, ] +

diff --git a/testsuite/gtk/defaultvalue.c b/testsuite/gtk/defaultvalue.c
index f1b4d1f7fca7f552c14f91a56acb3ea1e4b93bee..566370eb1528c70e21207bd1e1a775a7b1e5af13 100644 (file)
--- a/testsuite/gtk/defaultvalue.c
+++ b/testsuite/gtk/defaultvalue.c
@@ -123,6 +123,12 @@ test_type (gconstpointer data)
                                NULL);
       g_object_unref (list_store);
     }
+  else if (g_type_is_a (type, GSK_TYPE_GL_SHADER))
+    {
+      GBytes *bytes = g_bytes_new_static ("", 0);
+      instance = g_object_new (type, "source", bytes, NULL);
+      g_bytes_unref (bytes);
+    }
   else if (g_type_is_a (type, GDK_TYPE_CLIPBOARD) ||
            g_str_equal (g_type_name (type), "GdkX11Cursor"))
     instance = g_object_new (type, "display", display, NULL);
@@ -169,6 +175,11 @@ test_type (gconstpointer data)
          strcmp (pspec->name, "storable-formats") == 0)
        continue;
 
+      /* set in the constructor */
+      if (g_type_is_a (type, GSK_TYPE_GL_SHADER) &&
+         strcmp (pspec->name, "source") == 0)
+       continue;
+
       /* This one has a special-purpose default value */
       if (g_type_is_a (type, GTK_TYPE_DIALOG) &&
          (strcmp (pspec->name, "use-header-bar") == 0))

diff --git a/testsuite/gtk/notify.c b/testsuite/gtk/notify.c
index 80df7dda62772ea4d6cfac2cde9e4ded15800e11..f90fb66be249d56e65cea411356d4b634c9706d5 100644 (file)
--- a/testsuite/gtk/notify.c
+++ b/testsuite/gtk/notify.c
@@ -454,6 +454,12 @@ test_type (gconstpointer data)
                                NULL);
       gdk_content_formats_unref (formats);
     }
+  else if (g_type_is_a (type, GSK_TYPE_GL_SHADER))
+    {
+      GBytes *bytes = g_bytes_new_static ("", 0);
+      instance = g_object_new (type, "source", bytes, NULL);
+      g_bytes_unref (bytes);
+    }
   else if (g_type_is_a (type, GTK_TYPE_FILTER_LIST_MODEL) ||
            g_type_is_a (type, GTK_TYPE_NO_SELECTION) ||
            g_type_is_a (type, GTK_TYPE_SINGLE_SELECTION) ||

diff --git a/testsuite/gtk/objects-finalize.c b/testsuite/gtk/objects-finalize.c
index c105ca265c4e2010c75231e88adbb9fa3fb65217..2167d384d5585b08bcc5d70c248c0dc77301eb25 100644 (file)
--- a/testsuite/gtk/objects-finalize.c
+++ b/testsuite/gtk/objects-finalize.c
@@ -69,6 +69,12 @@ test_finalize_object (gconstpointer data)
                              NULL);
       gdk_content_formats_unref (formats);
     }
+  else if (g_type_is_a (test_type, GSK_TYPE_GL_SHADER))
+    {
+      GBytes *bytes = g_bytes_new_static ("", 0);
+      object = g_object_new (test_type, "source", bytes, NULL);
+      g_bytes_unref (bytes);
+    }
   else if (g_type_is_a (test_type, GTK_TYPE_FILTER_LIST_MODEL) ||
            g_type_is_a (test_type, GTK_TYPE_NO_SELECTION) ||
            g_type_is_a (test_type, GTK_TYPE_SINGLE_SELECTION) ||